]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
autoconf-2.64 compat: Don't use $(builddir)
authorOwen W. Taylor <otaylor@fishsoup.net>
Sat, 15 Aug 2009 13:32:39 +0000 (09:32 -0400)
committerOwen W. Taylor <otaylor@fishsoup.net>
Sat, 15 Aug 2009 14:17:35 +0000 (10:17 -0400)
$(builddir) is not a standard automake variable. With autoconf < 2.64
it ends up getting set in every Makefile.in to '.' (because autoconf
defines it), but that is no longer the case for 2.64.

Since $(builddir) was always '.', just use that instead.

src/Makefile.am

index a050e9cd0084ea1590f75ea40f2da163bbd3b5b3..6aa76bfb8561fa877bde89d99664319e8d967ce3 100644 (file)
@@ -173,7 +173,7 @@ CLEANFILES += Shell-0.1.gir
 # The dependency on libgnome-shell.la here is because g-ir-compiler opens it
 # (not the fake library, since we've already done the rewriting)
 Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir Big-1.0.gir
-       LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler --includedir=$(builddir) --includedir=$(MUTTER_LIB_DIR)/mutter/ Shell-0.1.gir -o $@
+       LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler --includedir=. --includedir=$(MUTTER_LIB_DIR)/mutter/ Shell-0.1.gir -o $@
 CLEANFILES += Shell-0.1.typelib
 
 Tidy-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile